Autogenerated HTML docs for v1.6.3-rc0
diff --git a/glossary-content.txt b/glossary-content.txt index 4fc1cf1..572374f 100644 --- a/glossary-content.txt +++ b/glossary-content.txt
@@ -449,6 +449,12 @@ An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference. +[[def_upstream_branch]]upstream branch:: + The default <<def_branch,branch>> that is merged into the branch in + question (or the branch in question is rebased onto). It is configured + via branch.<name>.remote and branch.<name>.merge. If the upstream branch + of 'A' is 'origin/B' sometimes we say "'A' is tracking 'origin/B'". + [[def_working_tree]]working tree:: The tree of actual checked out files. The working tree is normally equal to the <<def_HEAD,HEAD>> plus any local changes
